gtk/gtkmain.c: Use accessor functions to access GtkWindowGroup

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 6d9eca5a7fce31a3ecb9045a112d07d0fa851166..d2c44d3dc73e9f9f578b4b278e5ba477d50c307f 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1606,8 +1606,8 @@ gtk_main_do_event (GdkEvent *event)
   if (device)
     grab_widget = gtk_window_group_get_current_device_grab (window_group, device);
 
-  if (!grab_widget && window_group->grabs)
-    grab_widget = window_group->grabs->data;
+  if (!grab_widget)
+    grab_widget = gtk_window_group_get_current_grab (window_group);
 
   /* If the grab widget is an ancestor of the event widget
    *  then we send the event to the original event widget.
@@ -1650,7 +1650,8 @@ gtk_main_do_event (GdkEvent *event)
       
     case GDK_DELETE:
       g_object_ref (event_widget);
-      if ((!window_group->grabs || gtk_widget_get_toplevel (window_group->grabs->data) == event_widget) &&
+      grab_widget = gtk_window_group_get_current_grab (window_group);
+      if ((!grab_widget || gtk_widget_get_toplevel (grab_widget) == event_widget) &&
          !gtk_widget_event (event_widget, event))
        gtk_widget_destroy (event_widget);
       g_object_unref (event_widget);
@@ -2013,13 +2014,10 @@ gtk_grab_add (GtkWidget *widget)
       
       group = gtk_main_get_window_group (widget);
 
-      if (group->grabs)
-       old_grab_widget = (GtkWidget *)group->grabs->data;
-      else
-       old_grab_widget = NULL;
+      old_grab_widget = gtk_window_group_get_current_grab (group);
 
       g_object_ref (widget);
-      group->grabs = g_slist_prepend (group->grabs, widget);
+      //group->grabs = g_slist_prepend (group->grabs, widget);
 
       gtk_grab_notify (group, NULL, old_grab_widget, widget, TRUE);
     }
@@ -2032,9 +2030,7 @@ gtk_grab_get_current (void)
 
   group = gtk_main_get_window_group (NULL);
 
-  if (group->grabs)
-    return GTK_WIDGET (group->grabs->data);
-  return NULL;
+  return gtk_window_group_get_current_grab (group);
 }
 
 void
@@ -2050,12 +2046,9 @@ gtk_grab_remove (GtkWidget *widget)
       _gtk_widget_set_has_grab (widget, FALSE);
 
       group = gtk_main_get_window_group (widget);
-      group->grabs = g_slist_remove (group->grabs, widget);
-      
-      if (group->grabs)
-       new_grab_widget = (GtkWidget *)group->grabs->data;
-      else
-       new_grab_widget = NULL;
+      //group->grabs = g_slist_remove (group->grabs, widget);
+
+      new_grab_widget = gtk_window_group_get_current_grab (group);
 
       gtk_grab_notify (group, NULL, widget, new_grab_widget, FALSE);